Minor changes due to file movement to merge xen-unstable with xen-ia64-unstable

diff --git a/xen/arch/ia64/Makefile b/xen/arch/ia64/Makefile
index 94ddb88a799c2cde63bee7f0474b1638ed0e4b07..373b22f076fb5e0e9d1232f523a9a95fa3a904d9 100644 (file)
--- a/xen/arch/ia64/Makefile
+++ b/xen/arch/ia64/Makefile
@@ -69,6 +69,8 @@ $(BASEDIR)/include/asm-ia64/.offsets.h.stamp:
        [ -e $(BASEDIR)/include/asm-ia64/xen ] \
         || ln -s $(BASEDIR)/include/asm-ia64/linux $(BASEDIR)/include/asm-ia64/xen
 # Link to DM file in Xen for ia64/vti
+       [ -e $(BASEDIR)/include/asm-ia64/vmx_vpic.h ] \
+        || ln -s ../../include/asm-x86/vmx_vpic.h $(BASEDIR)/include/asm-ia64/vmx_vpic.h
        [ -e $(BASEDIR)/include/asm-ia64/vmx_vioapic.h ] \
         || ln -s ../../include/asm-x86/vmx_vioapic.h $(BASEDIR)/include/asm-ia64/vmx_vioapic.h
        [ -e $(BASEDIR)/arch/ia64/vmx/vmx_vioapic.c ] \

diff --git a/xen/include/public/io/blkif.h b/xen/include/public/io/blkif.h
index 44780ced7eca23e7ac5392108cfa2d19d9cf0636..ef95576f1663aeab0d8145d62bdd31937855dc96 100644 (file)
--- a/xen/include/public/io/blkif.h
+++ b/xen/include/public/io/blkif.h
@@ -11,6 +11,8 @@
 
 #include "ring.h"
 
+#include <asm-xen/gnttab.h>    /* for grant_ref_t */
+
 /*
  * Front->back notifications: When enqueuing a new request, sending a
  * notification can be made conditional on req_event (i.e., the generic